Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 29 Aug 2011 20:31:20 +0000 (13:31 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 29 Aug 2011 20:31:20 +0000 (13:31 -0700)
commita8e7b62c85fd7a33fe6a3d751727ff4a80edc4b9
tree25c864d0efd914ae98e3266b4553e41c4678ef51
parent46e1d44d6dd2d2b261fa0f8121338b30d98759bb
parenteeae31c7bc2af4e9398f0083f22ae6e4bf49bb3f
Merge from trunk.